Take into account the xpad and ypad when calculating the width and the

2001-07-13  Anders Carlsson  <andersca@codefactory.se>

	* gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
	into account the xpad and ypad when calculating the width and the
	height of the pixbuf cell.

diff --git a/ChangeLog b/ChangeLog
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 560db3b1d47db9b348624cd4c240b41646ad4264..abd83a8496f7746ef86b86ccacc924d36b2076f6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-07-13  Anders Carlsson  <andersca@codefactory.se>
+
+       * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render): Take
+       into account the xpad and ypad when calculating the width and the
+       height of the pixbuf cel.
+
 Thu Jul 12 18:29:40 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkradiomenuitem.[ch] (gtk_radio_menu_item_group): 

diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
index 0bb2cb8c9065b918e7f22ed668fbe89961845e24..66649e444f8e05322f61c78201e38f8136fe3f9c 100644 (file)
--- a/gtk/gtkcellrendererpixbuf.c
+++ b/gtk/gtkcellrendererpixbuf.c
@@ -248,9 +248,12 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
                                     &pix_rect.y,
                                     &pix_rect.width,
                                     &pix_rect.height);
+  
   pix_rect.x += cell_area->x;
   pix_rect.y += cell_area->y;
-
+  pix_rect.width -= cell->xpad * 2;
+  pix_rect.height -= cell->ypad * 2;
+  
   if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
     gdk_pixbuf_render_to_drawable_alpha (pixbuf,
                                          window,